Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 20:35:56 +0000 (12:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Dec 2011 20:35:56 +0000 (12:35 -0800)
commitf6fbc84e8d005f19488eeebf4b2d6398065200ba
treeb5519762aa1e6a1b13705b90bdf526503cfdf2b7
parente386f6ea723b6c030b527914dd864ef016ca63bc
parent5dd163f3c55d9f8576d1268a79c747e208fbc2d4
Merge from trunk.